From 67d95d0e6a96f274b0a85c7eec0e6fe4c03ef0bf Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Fri, 17 Oct 2014 09:56:19 +0100 Subject: [PATCH] tools/libxl: Fix building against libxl for LIBXL_API_VERSION < 0x040500 c/s 6276f66ebe "libxl: libxl_uuid_copy now takes a ctx argument" introduces API compatibiltiy for libxl_uuid_copy() which sadly is not valid C. Fix it. Signed-off-by: Andrew Cooper CC: Ian Campbell CC: Ian Jackson CC: Wei Liu Acked-by: Wei Liu Acked-by: Ian Campbell --- tools/libxl/libxl_uuid.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/libxl/libxl_uuid.h b/tools/libxl/libxl_uuid.h index 196b5bc3e9..c5041c7065 100644 --- a/tools/libxl/libxl_uuid.h +++ b/tools/libxl/libxl_uuid.h @@ -61,7 +61,12 @@ int libxl_uuid_from_string(libxl_uuid *uuid, const char *in); void libxl_uuid_copy(libxl_ctx *ctx_opt, libxl_uuid *dst, const libxl_uuid *src); #if defined(LIBXL_API_VERSION) && LIBXL_API_VERSION < 0x040500 -void libxl_uuid_copy(dst, src) libxl_uuid_copy(NULL, dst, src) +void static inline libxl_uuid_copy_0x040400(libxl_uuid *dst, + const libxl_uuid *src) +{ + libxl_uuid_copy(NULL, dst, src); +} +#define libxl_uuid_copy libxl_uuid_copy_0x040400 #endif void libxl_uuid_clear(libxl_uuid *uuid); -- 2.30.2